Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 18 Feb 2010 02:46:55 +0000 (02:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 18 Feb 2010 02:46:55 +0000 (02:46 +0000)

Trivial merge